Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename setPaymentDisabled to setPaymentStatus #474

Merged
merged 5 commits into from Oct 16, 2018

Conversation

0xKiwi
Copy link
Contributor

@0xKiwi 0xKiwi commented Oct 9, 2018

Also changes constant to view app-wide and renamed app-wide from disabled to inactive for the payment status.

#374

Also changes constant to view app-wide
@coveralls
Copy link

coveralls commented Oct 9, 2018

Coverage Status

Coverage remained the same at 96.212% when pulling 271b89f on IvanTheGreatDev:hotfix/rename-setpaymentdisabled into 67161d1 on aragon:master.

@0xKiwi 0xKiwi changed the title Renames setPaymentDisabled to setPaymentStatus Rename setPaymentDisabled to setPaymentStatus Oct 10, 2018
Copy link
Contributor

@sohkai sohkai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! I left a few comments, but this is looking good.

Do you think active / inactive is better terminology than enabled / disabled?

apps/finance/artifact.json Show resolved Hide resolved
*/
function setPaymentDisabled(uint256 _paymentId, bool _disabled)
function setPaymentStatus(uint256 _paymentId, bool _active)
external
authP(DISABLE_PAYMENTS_ROLE, arr(_paymentId))
Copy link
Contributor

@sohkai sohkai Oct 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should also rename this role, so it's less confusing. It can actually enable or disable existing payments, so I'd rename it to MANAGE_PAYMENTS_ROLE.

Although @izqui we should probably think of a way to completely disable a payment at some point (or remove the ability to re-enable payments).

@@ -192,7 +192,7 @@ contract MiniMeToken is Controlled {
require((_to != 0) && (_to != address(this)));
// If the amount being transfered is more than the balance of the
// account the transfer returns false
var previousBalanceFrom = balanceOfAt(_from, block.number);
uint256 previousBalanceFrom = balanceOfAt(_from, block.number);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you revert the changes to the MiniMeToken here?

I'm not opposed to fixing the compiler warnings here, but we'd also like it to stay as closely as possible to the original version and we should have a separate discussion if we should just update to MMT_0.2.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing!

apps/finance/test/finance.js Show resolved Hide resolved
@sohkai
Copy link
Contributor

sohkai commented Oct 11, 2018

Just to re-surface this from #474 (comment):

Although @izqui we should probably think of a way to completely disable a payment at some point (or remove the ability to re-enable payments).

@0xKiwi
Copy link
Contributor Author

0xKiwi commented Oct 12, 2018

Should be good to go now! 😄

@0xKiwi
Copy link
Contributor Author

0xKiwi commented Oct 16, 2018

What is this PR waiting on?

@izqui
Copy link
Contributor

izqui commented Oct 16, 2018

Just a final review, @IvanTheGreatDev! Just added 51539ca passing whether we are setting the payment as active as a parameter to the role.

Thanks for the contribution :)

@izqui izqui merged commit ebc5b04 into aragon:master Oct 16, 2018
@0xKiwi 0xKiwi deleted the hotfix/rename-setpaymentdisabled branch October 16, 2018 21:41
@0xKiwi 0xKiwi restored the hotfix/rename-setpaymentdisabled branch October 16, 2018 21:41
ramilexe pushed a commit to ConsiderItDone/aragon-apps that referenced this pull request Dec 9, 2021
* Renames setPaymentDisabled to setPaymentStatus
Also changes constant to view app-wide

* Rename bytes32 and add extra test for status

* Revert MiniMe to previous state

* Add active boolean as a param to MANAGE_PAYMENTS_ROLE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants